diff --git a/app/index.html b/app/index.html
index 2026eb6..3ffcbd5 100644
--- a/app/index.html
+++ b/app/index.html
@@ -7,6 +7,7 @@
     <link rel="icon" href="favicon.ico?v=2"/>
     <!-- build:css styles/app.min.css -->
     <link rel="stylesheet" href="styles/index.css">
+<<<<<<< HEAD
 
     <!-- endbuild -->
 </head>
@@ -16,15 +17,33 @@
     <app-navigation ng-if="dataService.showNavigation" path="dataService.path" show-navigation="dataService.showNavigation"></app-navigation>
 
     <main ng-view ng-class="{'content__container': dataService.showNavigation, 'login__wrapper': !dataService.showNavigation}">
+=======
+    <!-- endbuild -->
+</head>
+<body ng-style="dataService.bodyStyle" ng-attr-id="{{dataService.path == '/login' ? 'login': ''}}">
+
+    <app-header ng-if="dataService.showNavigation" path="dataService.path"></app-header>
+    <app-navigation ng-if="dataService.showNavigation" path="dataService.path" show-navigation="    dataService.showNavigation"></app-navigation>
+
+    <main ng-view ng-class="{'content__container': dataService.path != '/login', 'login__wrapper': dataService.path == '/login'}">
+>>>>>>> 4c1a3dd... Major update to code structure
     </main>
 
 	<!-- build:js scripts/vendor.min.js -->
 	<script src="../bower_components/angular/angular.min.js"></script>
 	<script src="../bower_components/angular-route/angular-route.min.js"></script>
+<<<<<<< HEAD
 	<script src="../bower_components/angular-clipboard/angular-clipboard.min.js"></script>
     <script src="../bower_components/angularUtils-pagination/dirPagination.min.js"></script>
+<<<<<<< HEAD
     <script src="../bower_components/hterm/js/hterm.js"></script>
 
+=======
+>>>>>>> 4c1a3dd... Major update to code structure
+=======
+    <script src="vendors/hterm/hterm_all.min.js"></script>
+
+>>>>>>> a96f9cc... created remote console page
 	<!-- endbuild -->
 
 	<!-- build:js scripts/app.min.js -->
@@ -48,6 +67,7 @@
 	<script src="common/directives/app-header.js"></script>
 	<script src="common/directives/app-navigation.js"></script>
 	<script src="common/directives/confirm.js"></script>
+<<<<<<< HEAD
 	<script src="common/directives/log-event.js"></script>
 	<script src="common/directives/log-filter.js"></script>
 	<script src="common/directives/log-search-control.js"></script>
@@ -80,6 +100,17 @@
     <script src="configuration/controllers/firmware-controller.js"></script>
     <script src="users/index.js"></script>
     <script src="users/controllers/user-accounts-controller.js"></script>
+=======
+
+	<script src="login/index.js"></script>
+	<script src="login/controllers/login-controller.js"></script>
+	<script src="overview/index.js"></script>
+	<script src="overview/controllers/bmc-reboot-controller.js"></script>
+	<script src="overview/controllers/power-operations-controller.js"></script>
+	<script src="overview/controllers/system-overview-controller.js"></script>
+	<script src="overview/controllers/unit-id-controller.js"></script>
+	<script src="overview/controllers/log-controller.js"></script>
+>>>>>>> 4c1a3dd... Major update to code structure
 	<!-- endbuild -->
 </body>