diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef169911..dc9164a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ build_project:
   script:
     - "( brew install libsodium json-c )"
     - "( ./lib/bin/build_libsodium-macos )"
-    - "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests && ./mpw-cli-tests )"
+    - "( cd ./platform-independent/c/cli && ./clean && targets=all ./build && ./mpw-tests && ./mpw-cli-tests )"
     - "( cd ./gradle && ./gradlew --info clean test )"
     - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator clean build )"
     - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' clean build )"
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5ac520d6..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: objective-c
-os: osx
-osx_image: xcode9.2
-env: TERM=dumb SHLVL=0
-git:
-  submodules: true
-script:
-  - "( brew install libsodium json-c )"
-  - "( ./lib/bin/build_libsodium-macos )"
-  - "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests && ./mpw-cli-tests )"
-  - "( cd ./gradle && ./gradlew --info clean test )"
-  - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator )"
-  - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' )"
-notifications:
-  webhooks:
-    urls:
-      - "https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MGxodW5hdGglM0FseW5kaXIuY29tLyUyMWR2S1JpaW1uc0Z3dWdseEpHSyUzQWx5bmRpci5jb20"
-    on_success: change  # always|never|change
-    on_failure: always
-    on_start: never
-
diff --git a/platform-darwin/MasterPassword-JNI.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-JNI.xcodeproj/project.pbxproj
index 0cb2c8eb..cc2eb806 100644
--- a/platform-darwin/MasterPassword-JNI.xcodeproj/project.pbxproj
+++ b/platform-darwin/MasterPassword-JNI.xcodeproj/project.pbxproj
@@ -62,7 +62,7 @@
 				DA1554ED20B3928E00EA92C5 /* mpw-util.h */,
 			);
 			name = core;
-			path = ../core/c/src;
+			path = ../platform-independent/c/core/src;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
index a7032768..c4930045 100644
--- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -1783,7 +1783,7 @@
 				93D39CF7DB942C69D1C5D6BE /* mpw-util.h */,
 			);
 			name = core;
-			path = ../core/c/src;
+			path = ../platform-independent/c/core/src;
 			sourceTree = "<group>";
 		};
 		DA0CC4F41EAB99BA009A8ED9 /* Resources */ = {
diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
index 3d1e88ff..2e452896 100644
--- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
+++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj
@@ -1820,7 +1820,7 @@
 				DA6773C61A4746AF004F356A /* mpw-util.h */,
 			);
 			name = core;
-			path = ../core/c/src;
+			path = ../platform-independent/c/core/src;
 			sourceTree = "<group>";
 		};
 		DA89D4E51A51E53100AC64D7 /* Pearl-Cocoa */ = {