diff --git a/services/filestore/.gitignore b/services/filestore/.gitignore
index 6d486a3b2c..723e09aef3 100644
--- a/services/filestore/.gitignore
+++ b/services/filestore/.gitignore
@@ -55,6 +55,8 @@ public/minjs/
 test/unit/js/
 test/acceptence/js
 
+user_files/*
+
 **.swp
 
 /log.json
diff --git a/services/filestore/config/settings.development.coffee b/services/filestore/config/settings.defaults.coffee
similarity index 51%
rename from services/filestore/config/settings.development.coffee
rename to services/filestore/config/settings.defaults.coffee
index 19088d3c76..642e1b5c3d 100644
--- a/services/filestore/config/settings.development.coffee
+++ b/services/filestore/config/settings.defaults.coffee
@@ -1,3 +1,5 @@
+Path = require "path"
+
 module.exports =
 	internal:
 		filestore:
@@ -5,34 +7,24 @@ module.exports =
 			host: "localhost"
 
 	filestore:
-		# which backend persistor to use.
-		# choices are
+		# Which backend persistor to use.
+		# Choices are
 		# s3 - Amazon S3
 		# fs - local filesystem
-		backend: "s3"
+		backend: "fs"
 		stores:
-		  # where to store user and template binary files
+		  	# where to store user and template binary files
 			#
-			# For Amazon S3 this is the bucket name to store binary files in
-			# Must contain full url like: <bucketname>.s3.amazonaws.com
+			# For Amazon S3 this is the bucket name to store binary files in.
 			#
 			# For local filesystem this is the directory to store the files in.
-			# Must contain full path, e.g. "/var/lib/sharelatex/data"
+			# Must contain full path, e.g. "/var/lib/sharelatex/data".
 			# This path must exist, not be tmpfs and be writable to by the user sharelatex is run as.
-			user_files: ""
-		s3:
-			# if you are using S3, then fill in your S3 details below
-			key: ""
-			secret: ""
-
-	# ShareLaTeX stores binary files like images in S3.
-	# Fill in your Amazon S3 credentials below.
-	s3:
-		key: ''
-		secret: ''
-		buckets:
-			user_files: ""
-			template_files: ""
+			user_files: Path.resolve(__dirname + "/../user_files")
+		# if you are using S3, then fill in your S3 details below
+		# s3:
+		# 	key: ""
+		# 	secret: ""
 
 	# Filestore health check
 	# ----------------------
diff --git a/services/filestore/package.json b/services/filestore/package.json
index f623ce2ae3..029b1e97e5 100644
--- a/services/filestore/package.json
+++ b/services/filestore/package.json
@@ -2,8 +2,8 @@
   "name": "filestore-sharelatex",
   "version": "0.0.1",
   "dependencies": {
-    "settings": "git+https://github.com/sharelatex/settings-sharelatex.git#master",
-    "logger": "git+https://github.com/sharelatex/logger-sharelatex.git#master",
+    "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master",
+    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master",
     "request": "2.14.0",
     "lynx": "0.0.11",
     "grunt-mocha-test": "~0.8.2",
diff --git a/services/filestore/user_files/.gitignore b/services/filestore/user_files/.gitignore
new file mode 100644
index 0000000000..e69de29bb2