diff --git a/.gitignore b/.gitignore
index 4695c7f..d07ef51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
-RCTCamera.xcodeproj/xcuserdata
-RCTCamera.xcodeproj/project.xcworkspace
+ios/RCTCamera.xcodeproj/xcuserdata
+ios/RCTCamera.xcodeproj/project.xcworkspace
diff --git a/Camera.ios.js b/index.ios.js
similarity index 98%
rename from Camera.ios.js
rename to index.ios.js
index 629b48e..c84a196 100644
--- a/Camera.ios.js
+++ b/index.ios.js
@@ -135,7 +135,7 @@ var Camera = React.createClass({
       type = constants.Type[type];
     }
 
-    var nativeProps = merge(this.props, {
+    var nativeProps = Object.assign({}, this.props, {
       style,
       aspect: aspect,
       type: type,
diff --git a/NSMutableDictionary+ImageMetadata.m b/ios/NSMutableDictionary+ImageMetadata.m
similarity index 100%
rename from NSMutableDictionary+ImageMetadata.m
rename to ios/NSMutableDictionary+ImageMetadata.m
diff --git a/RCTCamera.h b/ios/RCTCamera.h
similarity index 100%
rename from RCTCamera.h
rename to ios/RCTCamera.h
diff --git a/RCTCamera.m b/ios/RCTCamera.m
similarity index 100%
rename from RCTCamera.m
rename to ios/RCTCamera.m
diff --git a/RCTCamera.xcodeproj/project.pbxproj b/ios/RCTCamera.xcodeproj/project.pbxproj
similarity index 99%
rename from RCTCamera.xcodeproj/project.pbxproj
rename to ios/RCTCamera.xcodeproj/project.pbxproj
index 9bdb57a..7da1124 100644
--- a/RCTCamera.xcodeproj/project.pbxproj
+++ b/ios/RCTCamera.xcodeproj/project.pbxproj
@@ -176,8 +176,8 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-					"$(SRCROOT)/../react-native/React/**",
+					"$(SRCROOT)/../../../React/**",
+					"$(SRCROOT)/../../react-native/React/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
diff --git a/RCTCameraManager.h b/ios/RCTCameraManager.h
similarity index 100%
rename from RCTCameraManager.h
rename to ios/RCTCameraManager.h
diff --git a/RCTCameraManager.m b/ios/RCTCameraManager.m
similarity index 100%
rename from RCTCameraManager.m
rename to ios/RCTCameraManager.m
diff --git a/package.json b/package.json
index 1d270af..ca8b084 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,8 @@
     "type" : "git",
     "url" : "https://github.com/lwansbrough/react-native-camera.git"
   },
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "A Camera component for React Native. Also reads barcodes.",
-  "main": "Camera.ios.js",
   "author": "Lochlan Wansbrough <lochie@live.com> (http://lwansbrough.com)",
   "nativePackage": true,
   "keywords": [
@@ -17,8 +16,5 @@
     "qr",
     "code",
     "barcode"
-  ],
-  "dependencies": {
-    "merge": "^1.2.0"
-  }
+  ]
 }
diff --git a/react-native-camera.podspec b/react-native-camera.podspec
deleted file mode 100644
index 5275f02..0000000
--- a/react-native-camera.podspec
+++ /dev/null
@@ -1,14 +0,0 @@
-Pod::Spec.new do |s|
-
-  s.name         = "react-native-camera"
-  s.version      = "0.2.9"
-  s.summary      = "A Camera component for React Native. Also reads barcodes."
-  s.homepage     = "https://github.com/lwansbrough/react-native-camera"
-  s.license      = { :type => "MIT", :file => "LICENSE" }
-  s.author       = { "Lochlan Wansbrough" => "lochie@live.com" }
-  s.platform     = :ios, "7.0"
-  s.source       = { :git => "https://github.com/lwansbrough/react-native-camera.git", :tag => "v0.2.8" }
-  s.source_files = "*.{h,m}"
-  s.requires_arc = true
-  s.dependency 'React'
-end