diff --git a/.travis.yml b/.travis.yml
index 398bb67..6d8cb3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,8 @@ cache:
   yarn: true
 
 before_install:
-  - docker-compose up -d
   - cd gremlin-client
+  - docker-compose up -d
 
 install:
   - yarn
diff --git a/ci/conf/gremlin-server-secure-ci.yaml b/gremlin-client/ci/conf/gremlin-server-secure-ci.yaml
similarity index 100%
rename from ci/conf/gremlin-server-secure-ci.yaml
rename to gremlin-client/ci/conf/gremlin-server-secure-ci.yaml
diff --git a/docker-compose.yml b/gremlin-client/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to gremlin-client/docker-compose.yml