diff --git a/.travis.sh b/.travis.sh
index 9971d2af..332663eb 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -49,8 +49,6 @@ travis_script()
         ./gradlew assembleRelease
         popd 
     else
-        pushd build_cmake
-        
         mkdir build
         pushd build
         
@@ -69,16 +67,13 @@ travis_script()
             cmake --build . --config Release
             codesign -s "-" Release-iphoneos/Play.app
             pushd ..
-            pushd ..
             pushd installer_ios
             ./build.sh
             popd
             popd
-            popd
         fi;
         
         popd
-        popd
     fi;
 }
 
@@ -99,7 +94,7 @@ travis_before_deploy()
         $ANDROID_BUILD_TOOLS/apksigner sign --ks ../../installer_android/deploy.keystore --ks-key-alias deploy --ks-pass env:ANDROID_KEYSTORE_PASS --key-pass env:ANDROID_KEYSTORE_PASS Play-release.apk
     fi;
     if [ "$TARGET_OS" = "OSX" ]; then
-        cp ../../build_cmake/build/Play.dmg .
+        cp ../../build/Play.dmg .
     fi;
     if [ "$TARGET_OS" = "IOS" ]; then
         cp ../../installer_ios/Play.deb .
diff --git a/appveyor.yml b/appveyor.yml
index c6e54684..f3c467a6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,7 +40,7 @@ build_script:
     
     move ..\..\PlaySource Play
     
-    cd Play\build_cmake
+    cd Play
     
     mkdir build
     
@@ -50,7 +50,6 @@ build_script:
     
     cmake --build . --config %CONFIG_TYPE%
     
-    cd ..
     
     cd ..
     
diff --git a/build_android/build.gradle b/build_android/build.gradle
index d7dcbe36..79db51bc 100644
--- a/build_android/build.gradle
+++ b/build_android/build.gradle
@@ -112,7 +112,7 @@ android {
 
 	externalNativeBuild {
 		cmake {
-			path '../build_cmake/CMakeLists.txt'
+			path '../CMakeLists.txt'
 		}
 	}
 }
diff --git a/installer_ios/build.sh b/installer_ios/build.sh
index 4df2601e..9ea7e0b6 100755
--- a/installer_ios/build.sh
+++ b/installer_ios/build.sh
@@ -1,7 +1,7 @@
 #/bin/bash
 set -e
 mkdir -p Play/Applications/Play.app
-rsync -a ../build_cmake/build/Release-iphoneos/Play.app/* Play/Applications/Play.app
+rsync -a ../build/Release-iphoneos/Play.app/* Play/Applications/Play.app
 chmod -R 775 Play
 dpkg-deb -Zgzip -b Play
 dpkg-scanpackages -m . /dev/null > Packages