diff --git a/syMessaging/syMessaging.xcodeproj/project.pbxproj b/syMessaging/syMessaging.xcodeproj/project.pbxproj
index 3ed93e122..1a4c220ff 100644
--- a/syMessaging/syMessaging.xcodeproj/project.pbxproj
+++ b/syMessaging/syMessaging.xcodeproj/project.pbxproj
@@ -8,10 +8,10 @@
 
 /* Begin PBXBuildFile section */
 		B5BDF86A98AA08A193004CEC /* libPods-syMessaging.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EB4F087B767553CED2DEABB /* libPods-syMessaging.a */; };
-		F01628BA19E29A270071C473 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F01628B919E29A270071C473 /* LoginViewController.m */; };
 		F01628C119E29C660071C473 /* default-profile.png in Resources */ = {isa = PBXBuildFile; fileRef = F01628BC19E29C660071C473 /* default-profile.png */; };
 		F01628C319E29C660071C473 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = F01628BE19E29C660071C473 /* logo.png */; };
 		F024098219E7D177006E741B /* tab_recents@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F024098119E7D177006E741B /* tab_recents@2x.png */; };
+		F03EF5E819F16C4B00A0EE52 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F03EF5E719F16C4B00A0EE52 /* LoginViewController.m */; };
 		F05B955919DEDCD9008761B0 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F05B955219DEDCD9008761B0 /* HomeViewController.m */; };
 		F05B955A19DEDCD9008761B0 /* RecentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F05B955419DEDCD9008761B0 /* RecentsViewController.m */; };
 		F05B955B19DEDCD9008761B0 /* RoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F05B955619DEDCD9008761B0 /* RoomViewController.m */; };
@@ -43,11 +43,11 @@
 		1EB4F087B767553CED2DEABB /* libPods-syMessaging.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-syMessaging.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		477412429E0ABA7BC78E9A48 /* Pods-syMessaging.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-syMessaging.debug.xcconfig"; path = "Pods/Target Support Files/Pods-syMessaging/Pods-syMessaging.debug.xcconfig"; sourceTree = "<group>"; };
 		A2E42FBF1F066CD8150FDB2B /* Pods-syMessaging.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-syMessaging.release.xcconfig"; path = "Pods/Target Support Files/Pods-syMessaging/Pods-syMessaging.release.xcconfig"; sourceTree = "<group>"; };
-		F01628B819E29A270071C473 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
-		F01628B919E29A270071C473 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		F01628BC19E29C660071C473 /* default-profile.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default-profile.png"; sourceTree = "<group>"; };
 		F01628BE19E29C660071C473 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
 		F024098119E7D177006E741B /* tab_recents@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_recents@2x.png"; sourceTree = "<group>"; };
+		F03EF5E619F16C4B00A0EE52 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
+		F03EF5E719F16C4B00A0EE52 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		F05B955119DEDCD9008761B0 /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
 		F05B955219DEDCD9008761B0 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
 		F05B955319DEDCD9008761B0 /* RecentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecentsViewController.h; sourceTree = "<group>"; };
@@ -125,6 +125,15 @@
 			path = Assets;
 			sourceTree = "<group>";
 		};
+		F03EF5E519F16C4B00A0EE52 /* ViewController */ = {
+			isa = PBXGroup;
+			children = (
+				F03EF5E619F16C4B00A0EE52 /* LoginViewController.h */,
+				F03EF5E719F16C4B00A0EE52 /* LoginViewController.m */,
+			);
+			path = ViewController;
+			sourceTree = "<group>";
+		};
 		F07A80C919DD9DE700B621A1 = {
 			isa = PBXGroup;
 			children = (
@@ -148,12 +157,11 @@
 		F07A80D419DD9DE700B621A1 /* syMessaging */ = {
 			isa = PBXGroup;
 			children = (
+				F03EF5E519F16C4B00A0EE52 /* ViewController */,
 				F07A80D919DD9DE700B621A1 /* AppDelegate.h */,
 				F07A80DA19DD9DE700B621A1 /* AppDelegate.m */,
 				F05B955119DEDCD9008761B0 /* HomeViewController.h */,
 				F05B955219DEDCD9008761B0 /* HomeViewController.m */,
-				F01628B819E29A270071C473 /* LoginViewController.h */,
-				F01628B919E29A270071C473 /* LoginViewController.m */,
 				F072761619E54AB100CA306E /* MasterTabBarController.h */,
 				F072761719E54AB100CA306E /* MasterTabBarController.m */,
 				F05B955D19DEED8A008761B0 /* MatrixHandler.h */,
@@ -340,12 +348,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F01628BA19E29A270071C473 /* LoginViewController.m in Sources */,
 				F05B955A19DEDCD9008761B0 /* RecentsViewController.m in Sources */,
 				F05B955B19DEDCD9008761B0 /* RoomViewController.m in Sources */,
 				F07A80DB19DD9DE700B621A1 /* AppDelegate.m in Sources */,
 				F07A80D819DD9DE700B621A1 /* main.m in Sources */,
 				F05B955919DEDCD9008761B0 /* HomeViewController.m in Sources */,
+				F03EF5E819F16C4B00A0EE52 /* LoginViewController.m in Sources */,
 				F05B955F19DEED8A008761B0 /* MatrixHandler.m in Sources */,
 				F072761819E54AB100CA306E /* MasterTabBarController.m in Sources */,
 				F05B955C19DEDCD9008761B0 /* SettingsViewController.m in Sources */,
diff --git a/syMessaging/syMessaging/LoginViewController.h b/syMessaging/syMessaging/ViewController/LoginViewController.h
similarity index 100%
rename from syMessaging/syMessaging/LoginViewController.h
rename to syMessaging/syMessaging/ViewController/LoginViewController.h
diff --git a/syMessaging/syMessaging/LoginViewController.m b/syMessaging/syMessaging/ViewController/LoginViewController.m
similarity index 100%
rename from syMessaging/syMessaging/LoginViewController.m
rename to syMessaging/syMessaging/ViewController/LoginViewController.m