diff --git a/services/filestore/.gitignore b/services/filestore/.gitignore
index 5d1086933c..3c0b90c20d 100644
--- a/services/filestore/.gitignore
+++ b/services/filestore/.gitignore
@@ -36,28 +36,11 @@ Icon?
 Thumbs.db
 
 /node_modules/*
-test/IntergrationTests/js/*
 data/*/*
 
-app.js
 **/*.map
-cluster.js
-app/js/*
-test/IntergrationTests/js/*
-test/UnitTests/js/*
 cookies.txt
 uploads/*
-public/js/editor.js
-public/js/home.js
-public/js/forms.js
-public/js/gui.js
-public/js/admin.js
-public/stylesheets/mainStyle.css
-public/minjs/
-test/unit/js/
-test/acceptence/js
-cluster.js
-test/acceptance/js/
 
 user_files/*
 template_files/*
diff --git a/services/filestore/app/coffee/AWSSDKPersistorManager.js b/services/filestore/app/js/AWSSDKPersistorManager.js
similarity index 100%
rename from services/filestore/app/coffee/AWSSDKPersistorManager.js
rename to services/filestore/app/js/AWSSDKPersistorManager.js
diff --git a/services/filestore/app/coffee/BucketController.js b/services/filestore/app/js/BucketController.js
similarity index 100%
rename from services/filestore/app/coffee/BucketController.js
rename to services/filestore/app/js/BucketController.js
diff --git a/services/filestore/app/coffee/Errors.js b/services/filestore/app/js/Errors.js
similarity index 100%
rename from services/filestore/app/coffee/Errors.js
rename to services/filestore/app/js/Errors.js
diff --git a/services/filestore/app/coffee/FSPersistorManager.js b/services/filestore/app/js/FSPersistorManager.js
similarity index 100%
rename from services/filestore/app/coffee/FSPersistorManager.js
rename to services/filestore/app/js/FSPersistorManager.js
diff --git a/services/filestore/app/coffee/FileController.js b/services/filestore/app/js/FileController.js
similarity index 100%
rename from services/filestore/app/coffee/FileController.js
rename to services/filestore/app/js/FileController.js
diff --git a/services/filestore/app/coffee/FileConverter.js b/services/filestore/app/js/FileConverter.js
similarity index 100%
rename from services/filestore/app/coffee/FileConverter.js
rename to services/filestore/app/js/FileConverter.js
diff --git a/services/filestore/app/coffee/FileHandler.js b/services/filestore/app/js/FileHandler.js
similarity index 100%
rename from services/filestore/app/coffee/FileHandler.js
rename to services/filestore/app/js/FileHandler.js
diff --git a/services/filestore/app/coffee/HealthCheckController.js b/services/filestore/app/js/HealthCheckController.js
similarity index 100%
rename from services/filestore/app/coffee/HealthCheckController.js
rename to services/filestore/app/js/HealthCheckController.js
diff --git a/services/filestore/app/coffee/ImageOptimiser.js b/services/filestore/app/js/ImageOptimiser.js
similarity index 100%
rename from services/filestore/app/coffee/ImageOptimiser.js
rename to services/filestore/app/js/ImageOptimiser.js
diff --git a/services/filestore/app/coffee/KeyBuilder.js b/services/filestore/app/js/KeyBuilder.js
similarity index 100%
rename from services/filestore/app/coffee/KeyBuilder.js
rename to services/filestore/app/js/KeyBuilder.js
diff --git a/services/filestore/app/coffee/LocalFileWriter.js b/services/filestore/app/js/LocalFileWriter.js
similarity index 100%
rename from services/filestore/app/coffee/LocalFileWriter.js
rename to services/filestore/app/js/LocalFileWriter.js
diff --git a/services/filestore/app/coffee/PersistorManager.js b/services/filestore/app/js/PersistorManager.js
similarity index 100%
rename from services/filestore/app/coffee/PersistorManager.js
rename to services/filestore/app/js/PersistorManager.js
diff --git a/services/filestore/app/coffee/S3PersistorManager.js b/services/filestore/app/js/S3PersistorManager.js
similarity index 100%
rename from services/filestore/app/coffee/S3PersistorManager.js
rename to services/filestore/app/js/S3PersistorManager.js
diff --git a/services/filestore/app/coffee/SafeExec.js b/services/filestore/app/js/SafeExec.js
similarity index 100%
rename from services/filestore/app/coffee/SafeExec.js
rename to services/filestore/app/js/SafeExec.js