diff --git a/application/controllers/Error_404 b/application/controllers/Error_404
index e19b363..9473656 100644
--- a/application/controllers/Error_404
+++ b/application/controllers/Error_404
@@ -34,7 +34,7 @@ class Errorr_404 extends CI_Controller
         
         if(!isset($isLoggedIn) || $isLoggedIn != TRUE)
         {
-            $this->load->view('login');
+            $this->load->view('users/login');
         }
         else
         {
diff --git a/application/controllers/Login.php b/application/controllers/Login.php
index 770a9e8..0a779f2 100644
--- a/application/controllers/Login.php
+++ b/application/controllers/Login.php
@@ -35,7 +35,7 @@ function isLoggedIn()
         
         if(!isset($isLoggedIn) || $isLoggedIn != TRUE)
         {
-            $this->load->view('login');
+            $this->load->view('users/login');
         }
         else
         {
@@ -109,7 +109,7 @@ public function forgotPassword()
         
         if(!isset($isLoggedIn) || $isLoggedIn != TRUE)
         {
-            $this->load->view('forgotPassword');
+            $this->load->view('users/forgotPassword');
         }
         else
         {
@@ -203,7 +203,7 @@ function resetPasswordConfirmUser($activation_id, $email)
         
         if ($is_correct == 1)
         {
-            $this->load->view('newPassword', $data);
+            $this->load->view('users/newPassword', $data);
         }
         else
         {
diff --git a/application/controllers/User.php b/application/controllers/User.php
index 241fee9..3f9719c 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -28,7 +28,7 @@ public function index()
     {
         $this->global['pageTitle'] = 'CodeInsect : Dashboard';
         
-        $this->loadViews("dashboard", $this->global, NULL , NULL);
+        $this->loadViews("general/dashboard", $this->global, NULL , NULL);
     }
     
     /**
@@ -55,7 +55,7 @@ function userListing()
             
             $this->global['pageTitle'] = 'CodeInsect : User Listing';
             
-            $this->loadViews("users", $this->global, $data, NULL);
+            $this->loadViews("users/users", $this->global, $data, NULL);
         }
     }
 
@@ -75,7 +75,7 @@ function addNew()
             
             $this->global['pageTitle'] = 'CodeInsect : Add New User';
 
-            $this->loadViews("addNew", $this->global, $data, NULL);
+            $this->loadViews("users/addNew", $this->global, $data, NULL);
         }
     }
 
@@ -171,7 +171,7 @@ function editOld($userId = NULL)
 
             $this->global['pageTitle'] = 'CodeInsect : Edit User';
             
-            $this->loadViews("editOld", $this->global, $data, NULL);
+            $this->loadViews("users/editOld", $this->global, $data, NULL);
         }
     }
     
@@ -271,7 +271,7 @@ function pageNotFound()
     {
         $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found';
         
-        $this->loadViews("404", $this->global, NULL, NULL);
+        $this->loadViews("general/404", $this->global, NULL, NULL);
     }
 
     /**
@@ -308,7 +308,7 @@ function loginHistoy($userId = NULL)
             
             $this->global['pageTitle'] = 'CodeInsect : User Login History';
             
-            $this->loadViews("loginHistory", $this->global, $data, NULL);
+            $this->loadViews("users/loginHistory", $this->global, $data, NULL);
         }        
     }
 
@@ -321,7 +321,7 @@ function profile($active = "details")
         $data["active"] = $active;
         
         $this->global['pageTitle'] = $active == "details" ? 'CodeInsect : My Profile' : 'CodeInsect : Change Password';
-        $this->loadViews("profile", $this->global, $data, NULL);
+        $this->loadViews("users/profile", $this->global, $data, NULL);
     }
 
     /**
diff --git a/application/libraries/BaseController.php b/application/libraries/BaseController.php
index 8cf7512..33bf152 100644
--- a/application/libraries/BaseController.php
+++ b/application/libraries/BaseController.php
@@ -125,7 +125,7 @@ function loadThis() {
 		$this->global ['pageTitle'] = 'CodeInsect : Access Denied';
 		
 		$this->load->view ( 'includes/header', $this->global );
-		$this->load->view ( 'access' );
+		$this->load->view ( 'general/access' );
 		$this->load->view ( 'includes/footer' );
 	}
 	
diff --git a/application/views/404.php b/application/views/general/404.php
similarity index 100%
rename from application/views/404.php
rename to application/views/general/404.php
diff --git a/application/views/access.php b/application/views/general/access.php
similarity index 100%
rename from application/views/access.php
rename to application/views/general/access.php
diff --git a/application/views/dashboard.php b/application/views/general/dashboard.php
similarity index 100%
rename from application/views/dashboard.php
rename to application/views/general/dashboard.php
diff --git a/application/views/addNew.php b/application/views/users/addNew.php
similarity index 100%
rename from application/views/addNew.php
rename to application/views/users/addNew.php
diff --git a/application/views/changePassword.php b/application/views/users/changePassword.php
similarity index 100%
rename from application/views/changePassword.php
rename to application/views/users/changePassword.php
diff --git a/application/views/editOld.php b/application/views/users/editOld.php
similarity index 100%
rename from application/views/editOld.php
rename to application/views/users/editOld.php
diff --git a/application/views/forgotPassword.php b/application/views/users/forgotPassword.php
similarity index 100%
rename from application/views/forgotPassword.php
rename to application/views/users/forgotPassword.php
diff --git a/application/views/login.php b/application/views/users/login.php
similarity index 100%
rename from application/views/login.php
rename to application/views/users/login.php
diff --git a/application/views/loginHistory.php b/application/views/users/loginHistory.php
similarity index 100%
rename from application/views/loginHistory.php
rename to application/views/users/loginHistory.php
diff --git a/application/views/newPassword.php b/application/views/users/newPassword.php
similarity index 100%
rename from application/views/newPassword.php
rename to application/views/users/newPassword.php
diff --git a/application/views/profile.php b/application/views/users/profile.php
similarity index 100%
rename from application/views/profile.php
rename to application/views/users/profile.php
diff --git a/application/views/users.php b/application/views/users/users.php
similarity index 100%
rename from application/views/users.php
rename to application/views/users/users.php