diff --git a/.travis.yml b/.travis.yml
index 2c9b9835..ae3281c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,12 @@ addons:
 before_install:
 - mysql -e 'CREATE DATABASE IF NOT EXISTS phpvms;'
 before_script:
-- cp .env.travis .env
+- cp .travis/env.travis .env
 - composer install --no-interaction
 script:
 - php artisan database:create --reset
 - php artisan migrate:refresh --seed
-- cp tests/phpunit.travis.xml phpunit.xml
+- cp .travis/phpunit.travis.xml phpunit.xml
 - vendor/bin/phpunit --debug --verbose
 after_failure:
 - cat storage/logs/*.log
diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh
index 85e2ec50..029e390b 100755
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -17,11 +17,10 @@ if [ "$TRAVIS" = "true" ]; then
     find . -type d -name ".git" | xargs rm -rf
     rm -rf .idea phpvms.iml .travis .dpl
     rm -rf .phpstorm.meta.php _ide_helper.php
-    rm -rf .env .env.prod.example
     mv .env.dev.example .env
 
     echo "creating tarball"
-    tar -czf /tmp/$TAR_NAME -C $TRAVIS_BUILD_DIR/../ phpvms/.
+    tar -czf /tmp/$TAR_NAME -C $TRAVIS_BUILD_DIR/../ .
 
     echo "running rsync"
     rsync -ahP --delete-after /tmp/$TAR_NAME downloads@phpvms.net:/var/www/downloads/
diff --git a/.env.travis b/.travis/env.travis
similarity index 100%
rename from .env.travis
rename to .travis/env.travis
diff --git a/tests/phpunit.travis.xml b/.travis/phpunit.travis.xml
similarity index 100%
rename from tests/phpunit.travis.xml
rename to .travis/phpunit.travis.xml