diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/CardsController.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/CardsController.cs
similarity index 100%
rename from DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/CardsController.cs
rename to DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/CardsController.cs
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/SwipeDataController.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/SwipeDataController.cs
similarity index 90%
rename from DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/SwipeDataController.cs
rename to DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/SwipeDataController.cs
index 5bf1d76..0618619 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/SwipeDataController.cs
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/SwipeDataController.cs
@@ -9,13 +9,11 @@ namespace WindowsDataCenter
     [RoutePrefix("api/swipedata")]
     public class SwipeDataController : ApiController
     {
-        //private SQLiteConnection _connection;
         private readonly IRepository _repo;
         public SwipeDataController(IRepository repo)
         {
             if(repo == null) throw new ArgumentNullException();
             _repo = repo;
-            //_connection = conn;
         }
 
         [HttpPost]
@@ -38,7 +36,6 @@ namespace WindowsDataCenter
             //}
             //else
             //{
-            //    //TODO: handle when more than one comes back. should NEVER happen but....
             //    userId = cardIdQuery.First().UserId_FK;
             //}
             
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/UsersController.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/UsersController.cs
similarity index 93%
rename from DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/UsersController.cs
rename to DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/UsersController.cs
index 472d8eb..0322f2d 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/UsersController.cs
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/UsersController.cs
@@ -42,6 +42,7 @@ namespace WindowsDataCenter
         public IHttpActionResult CreateUser([FromBody] User user)
         {
             _repo.UpdateUser(user);
+            //TODO return ID.
             return ResponseMessage(new HttpResponseMessage(HttpStatusCode.OK) {Content = new StringContent("unknownIdTODO")});
         }
 
@@ -50,10 +51,11 @@ namespace WindowsDataCenter
         public IHttpActionResult EditUser([FromBody] User user)
         {
             _repo.UpdateUser(user);
-
+            //TODO: MUST HAVE - return user id!
             return
                 ResponseMessage(new HttpResponseMessage(HttpStatusCode.Created)
                 {
+                    //TODO: return ID
                     Content = new StringContent("TODO:return UserID")
                 });
         }
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/ValuesController.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/ValuesController.cs
similarity index 100%
rename from DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/ValuesController.cs
rename to DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Controllers/ValuesController.cs