diff --git a/question/Dockerfile b/questionservice/Dockerfile
similarity index 100%
rename from question/Dockerfile
rename to questionservice/Dockerfile
diff --git a/question/package-lock.json b/questionservice/package-lock.json
similarity index 100%
rename from question/package-lock.json
rename to questionservice/package-lock.json
diff --git a/question/package.json b/questionservice/package.json
similarity index 100%
rename from question/package.json
rename to questionservice/package.json
diff --git a/question/server.js b/questionservice/server.js
similarity index 100%
rename from question/server.js
rename to questionservice/server.js
diff --git a/users/authservice/.dockerignore b/userservice/authservice/.dockerignore
similarity index 100%
rename from users/authservice/.dockerignore
rename to userservice/authservice/.dockerignore
diff --git a/users/authservice/Dockerfile b/userservice/authservice/Dockerfile
similarity index 100%
rename from users/authservice/Dockerfile
rename to userservice/authservice/Dockerfile
diff --git a/users/authservice/auth-model.js b/userservice/authservice/auth-model.js
similarity index 100%
rename from users/authservice/auth-model.js
rename to userservice/authservice/auth-model.js
diff --git a/users/authservice/auth-service.js b/userservice/authservice/auth-service.js
similarity index 100%
rename from users/authservice/auth-service.js
rename to userservice/authservice/auth-service.js
diff --git a/users/authservice/auth-service.test.js b/userservice/authservice/auth-service.test.js
similarity index 100%
rename from users/authservice/auth-service.test.js
rename to userservice/authservice/auth-service.test.js
diff --git a/users/authservice/package-lock.json b/userservice/authservice/package-lock.json
similarity index 100%
rename from users/authservice/package-lock.json
rename to userservice/authservice/package-lock.json
diff --git a/users/authservice/package.json b/userservice/authservice/package.json
similarity index 100%
rename from users/authservice/package.json
rename to userservice/authservice/package.json
diff --git a/users/userservice/.dockerignore b/userservice/userservice/.dockerignore
similarity index 100%
rename from users/userservice/.dockerignore
rename to userservice/userservice/.dockerignore
diff --git a/users/userservice/Dockerfile b/userservice/userservice/Dockerfile
similarity index 100%
rename from users/userservice/Dockerfile
rename to userservice/userservice/Dockerfile
diff --git a/users/userservice/package-lock.json b/userservice/userservice/package-lock.json
similarity index 100%
rename from users/userservice/package-lock.json
rename to userservice/userservice/package-lock.json
diff --git a/users/userservice/package.json b/userservice/userservice/package.json
similarity index 100%
rename from users/userservice/package.json
rename to userservice/userservice/package.json
diff --git a/users/userservice/user-model.js b/userservice/userservice/user-model.js
similarity index 100%
rename from users/userservice/user-model.js
rename to userservice/userservice/user-model.js
diff --git a/users/userservice/user-service.js b/userservice/userservice/user-service.js
similarity index 100%
rename from users/userservice/user-service.js
rename to userservice/userservice/user-service.js
diff --git a/users/userservice/user-service.test.js b/userservice/userservice/user-service.test.js
similarity index 100%
rename from users/userservice/user-service.test.js
rename to userservice/userservice/user-service.test.js