diff --git a/src/main/webapp/js/goatApp/view/GoatRouter.js b/src/main/webapp/js/goatApp/view/GoatRouter.js
index 4e1213808..7d4dda3d8 100644
--- a/src/main/webapp/js/goatApp/view/GoatRouter.js
+++ b/src/main/webapp/js/goatApp/view/GoatRouter.js
@@ -1,50 +1,50 @@
 define(['jquery',
-	'underscore',
-	'backbone',
-	'goatApp/controller/LessonController',
-	'goatApp/controller/MenuController',
-	'goatApp/view/LessonContentView',
-	'goatApp/view/MenuView',
-	'goatApp/view/TitleView'
-	], function ($,_,Backbone,LessonController,MenuController,LessonContentView,MenuView,TitleView) {
+    'underscore',
+    'backbone',
+    'goatApp/controller/LessonController',
+    'goatApp/controller/MenuController',
+    'goatApp/view/LessonContentView',
+    'goatApp/view/MenuView',
+    'goatApp/view/TitleView'
+], function ($,_,Backbone,LessonController,MenuController,LessonContentView,MenuView,TitleView) {
 
-		var lessonView = new LessonContentView();
-		var menuView = new MenuView(); 
-		var titleView = new TitleView();
+    var lessonView = new LessonContentView();
+    var menuView = new MenuView();
+    var titleView = new TitleView();
 
-		var GoatAppRouter = Backbone.Router.extend({
-			routes: {
-				//#....
-				'welcome':'welcomeRoute',
-				'attack/:scr/:menu':'attackRoute' //	
-		 	},
-			lessonController: new LessonController({
-				lessonView:lessonView
-			}),
-			menuController: new MenuController({
-				menuView:menuView,
-				titleView:titleView
-			}),
+    var GoatAppRouter = Backbone.Router.extend({
+        routes: {
+            //#....
+            'welcome':'welcomeRoute',
+            'attack/:scr/:menu':'attackRoute' //
+        },
+        lessonController: new LessonController({
+            lessonView:lessonView
+        }),
+        menuController: new MenuController({
+            menuView:menuView,
+            titleView:titleView
+        }),
 
-			init:function() {
-				goatRouter =  new GoatAppRouter();
-				this.lessonController.start();
-				this.menuController.initMenu();
+        init:function() {
+            goatRouter =  new GoatAppRouter();
+            this.lessonController.start();
+            this.menuController.initMenu();
 
-				goatRouter.on('route:attackRoute', function(scr,menu) {
-					console.log('attack route');
-					this.lessonController.loadLesson(scr,menu);
-					this.menuController.updateMenu(scr,menu);
-					//update menu
-				});
-				goatRouter.on('route:welcomeRoute', function() {
-					alert('welcome route');
-				});
-				
-				Backbone.history.start();
-			}
-		});
+            goatRouter.on('route:attackRoute', function(scr,menu) {
+                console.log('attack route');
+                this.lessonController.loadLesson(scr,menu);
+                this.menuController.updateMenu(scr,menu);
+                //update menu
+            });
+            goatRouter.on('route:welcomeRoute', function() {
+                alert('welcome route');
+            });
 
-		return GoatAppRouter;
+            Backbone.history.start();
+        }
+    });
+
+    return GoatAppRouter;
 
 });
\ No newline at end of file
diff --git a/src/main/webapp/js/goatApp/view/goatRouter.js b/src/main/webapp/js/goatApp/view/goatRouter.js
deleted file mode 100644
index 20e1f786d..000000000
--- a/src/main/webapp/js/goatApp/view/goatRouter.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define(['jquery',
-	'underscore',
-	'backbone',
-	'goatApp/controller/LessonController',
-	'goatApp/controller/MenuController',
-	'goatApp/view/LessonContentView',
-	'goatApp/view/MenuView',
-	'goatApp/view/TitleView'
-], function ($,_,Backbone,LessonController,MenuController,LessonContentView,MenuView,TitleView) {
-
-	var lessonView = new LessonContentView();
-	var menuView = new MenuView();
-	var titleView = new TitleView();
-
-	var GoatAppRouter = Backbone.Router.extend({
-		routes: {
-			//#....
-			'welcome':'welcomeRoute',
-			'attack/:scr/:menu':'attackRoute' //
-		},
-		lessonController: new LessonController({
-			lessonView:lessonView
-		}),
-		menuController: new MenuController({
-			menuView:menuView,
-			titleView:titleView
-		}),
-
-		init:function() {
-			goatRouter =  new GoatAppRouter();
-			this.lessonController.start();
-			this.menuController.initMenu();
-
-			goatRouter.on('route:attackRoute', function(scr,menu) {
-				console.log('attack route');
-				this.lessonController.loadLesson(scr,menu);
-				this.menuController.updateMenu(scr,menu);
-				//update menu
-			});
-			goatRouter.on('route:welcomeRoute', function() {
-				alert('welcome route');
-			});
-
-			Backbone.history.start();
-		}
-	});
-
-	return GoatAppRouter;
-
-});
\ No newline at end of file