diff --git a/src/Ombi/.vscode/extensions.json b/src/.vscode/extensions.json
similarity index 100%
rename from src/Ombi/.vscode/extensions.json
rename to src/.vscode/extensions.json
diff --git a/src/Ombi/.vscode/launch.json b/src/.vscode/launch.json
similarity index 88%
rename from src/Ombi/.vscode/launch.json
rename to src/.vscode/launch.json
index e99135bb9..304a1c5f9 100644
--- a/src/Ombi/.vscode/launch.json
+++ b/src/.vscode/launch.json
@@ -10,9 +10,9 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceRoot}/bin/Debug/netcoreapp2.0/Ombi.dll",
+            "program": "${workspaceRoot}/Ombi/bin/Debug/netcoreapp2.0/Ombi.dll",
             "args": [],
-            "cwd": "${workspaceRoot}",
+            "cwd": "${workspaceRoot}/Ombi/",
             "stopAtEntry": false,
             "internalConsoleOptions": "openOnSessionStart",
             "launchBrowser": {
@@ -33,7 +33,7 @@
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
             "sourceFileMap": {
-                "/Views": "${workspaceRoot}/Views"
+                "/Views": "${workspaceRoot}/Ombi/Views"
             }
         },
         {
diff --git a/src/Ombi/.vscode/settings.json b/src/.vscode/settings.json
similarity index 100%
rename from src/Ombi/.vscode/settings.json
rename to src/.vscode/settings.json
diff --git a/src/Ombi/.vscode/tasks.json b/src/.vscode/tasks.json
similarity index 89%
rename from src/Ombi/.vscode/tasks.json
rename to src/.vscode/tasks.json
index e45c7577c..ad868d2dc 100644
--- a/src/Ombi/.vscode/tasks.json
+++ b/src/.vscode/tasks.json
@@ -7,7 +7,7 @@
         {
             "taskName": "build",
             "args": [
-                "${workspaceRoot}/Ombi.csproj"
+                "${workspaceRoot}/Ombi/Ombi.csproj"
             ],
             "isBuildCommand": true,
             "problemMatcher": "$msCompile"
diff --git a/src/Ombi/Controllers/IdentityController.cs b/src/Ombi/Controllers/IdentityController.cs
index b4321c703..cf4cbd8d2 100644
--- a/src/Ombi/Controllers/IdentityController.cs
+++ b/src/Ombi/Controllers/IdentityController.cs
@@ -37,7 +37,6 @@ namespace Ombi.Controllers
     /// <summary>
     /// The Identity Controller, the API for everything Identity/User related
     /// </summary>
-    [PowerUser]
     [ApiV1]
     [Produces("application/json")]
     public class IdentityController : Controller
@@ -127,7 +126,8 @@ namespace Ombi.Controllers
         /// Gets all users.
         /// </summary>
         /// <returns>Information about all users</returns>
-        [HttpGet("Users")]
+        [HttpGet("Users")]   
+        [PowerUser]
         public async Task<IEnumerable<UserViewModel>> GetAllUsers()
         {
             var users = await UserManager.Users
@@ -160,7 +160,8 @@ namespace Ombi.Controllers
         /// Gets the user by the user id.
         /// </summary>
         /// <returns>Information about the user</returns>
-        [HttpGet("User/{id}")]
+        [HttpGet("User/{id}")]   
+        [PowerUser]
         public async Task<UserViewModel> GetUser(string id)
         {
             var user = await UserManager.Users.FirstOrDefaultAsync(x => x.Id == id);
@@ -212,7 +213,8 @@ namespace Ombi.Controllers
         /// </summary>
         /// <param name = "user" > The user.</param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpPost]   
+        [PowerUser]
         public async Task<OmbiIdentityResult> CreateUser([FromBody] UserViewModel user)
         {
             if (!EmailValidator.IsValidEmail(user.EmailAddress))
@@ -336,7 +338,8 @@ namespace Ombi.Controllers
         /// </summary>
         /// <param name = "ui" > The user.</param>
         /// <returns></returns>
-        [HttpPut]
+        [HttpPut]   
+        [PowerUser]
         public async Task<OmbiIdentityResult> UpdateUser([FromBody] UserViewModel ui)
         {
             if (!EmailValidator.IsValidEmail(ui.EmailAddress))
@@ -391,7 +394,8 @@ namespace Ombi.Controllers
         /// </summary>
         /// <param name="userId">The user.</param>
         /// <returns></returns>
-        [HttpDelete("{userId}")]
+        [HttpDelete("{userId}")]   
+        [PowerUser]
         public async Task<OmbiIdentityResult> DeleteUser(string userId)
         {
 
@@ -419,7 +423,8 @@ namespace Ombi.Controllers
         /// Gets all available claims in the system.
         /// </summary>
         /// <returns></returns>
-        [HttpGet("claims")]
+        [HttpGet("claims")]   
+        [PowerUser]
         public async Task<IEnumerable<ClaimCheckboxes>> GetAllClaims()
         {
             var claims = new List<ClaimCheckboxes>();
@@ -526,7 +531,8 @@ namespace Ombi.Controllers
             };
         }
 
-        [HttpPost("welcomeEmail")]
+        [HttpPost("welcomeEmail")]   
+        [PowerUser]
         public void SendWelcomeEmail([FromBody] UserViewModel user)
         {
             var ombiUser = new OmbiUser