diff --git a/chapter1/GuessTheNumber.html b/GuessTheNumber/GuessTheNumber.html
similarity index 87%
rename from chapter1/GuessTheNumber.html
rename to GuessTheNumber/GuessTheNumber.html
index e2a4f85..e19727b 100644
--- a/chapter1/GuessTheNumber.html
+++ b/GuessTheNumber/GuessTheNumber.html
@@ -4,7 +4,7 @@
 	<title>Guess The Number !</title>
 	<link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
 </head>
-<body ng-app>
+<body ng-app="app">
 <div class="container" ng-controller="GuessTheNumberController">
 	<h2>Guess the Number !</h2>
 	<p class="well lead">Guess the computer generated random number between 1 and 1000.</p>
@@ -18,8 +18,10 @@ <h2>Guess the Number !</h2>
 	</p>
 	<p class="text-info">No of guesses : <span class="badge">{{noOfTries}}</span><p>
 </div>
-	<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular.js"></script>
+	<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.3/angular.js"></script>
 	<script type="text/javascript">
+		angular.module('app',[])
+		.controller('GuessTheNumberController', GuessTheNumberController);
 		function GuessTheNumberController($scope) {
 			$scope.verifyGuess = function () {
 				$scope.deviation = $scope.original - $scope.guess;
diff --git a/chapter1/readme.txt b/GuessTheNumber/readme.txt
similarity index 100%
rename from chapter1/readme.txt
rename to GuessTheNumber/readme.txt
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..3a0d1e0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# AngularJS By Example
+
+[![AngularJS By Example Front Cover](https://d1ldz4te4covpm.cloudfront.net/sites/default/files/imagecache/ppv4_main_book_cover/9781783553815.png)](https://www.packtpub.com/web-development/angularjs-example)
+
+Source code repository for the book [AngularJS by Example](https://www.packtpub.com/web-development/angularjs-example)
\ No newline at end of file
diff --git a/chapter2/.gitignore b/trainer/.gitignore
similarity index 100%
rename from chapter2/.gitignore
rename to trainer/.gitignore
diff --git a/chapter2/app/css/app.css b/trainer/app/css/app.css
similarity index 100%
rename from chapter2/app/css/app.css
rename to trainer/app/css/app.css
diff --git a/chapter2/app/img/JumpingJacks.png b/trainer/app/img/JumpingJacks.png
similarity index 100%
rename from chapter2/app/img/JumpingJacks.png
rename to trainer/app/img/JumpingJacks.png
diff --git a/chapter2/app/img/Plank.png b/trainer/app/img/Plank.png
similarity index 100%
rename from chapter2/app/img/Plank.png
rename to trainer/app/img/Plank.png
diff --git a/chapter2/app/img/Pushup.png b/trainer/app/img/Pushup.png
similarity index 100%
rename from chapter2/app/img/Pushup.png
rename to trainer/app/img/Pushup.png
diff --git a/chapter2/app/img/crunches.png b/trainer/app/img/crunches.png
similarity index 100%
rename from chapter2/app/img/crunches.png
rename to trainer/app/img/crunches.png
diff --git a/chapter2/app/img/highknees.png b/trainer/app/img/highknees.png
similarity index 100%
rename from chapter2/app/img/highknees.png
rename to trainer/app/img/highknees.png
diff --git a/chapter2/app/img/lunges.png b/trainer/app/img/lunges.png
similarity index 100%
rename from chapter2/app/img/lunges.png
rename to trainer/app/img/lunges.png
diff --git a/chapter2/app/img/pushupNRotate.jpg b/trainer/app/img/pushupNRotate.jpg
similarity index 100%
rename from chapter2/app/img/pushupNRotate.jpg
rename to trainer/app/img/pushupNRotate.jpg
diff --git a/chapter2/app/img/rest.png b/trainer/app/img/rest.png
similarity index 100%
rename from chapter2/app/img/rest.png
rename to trainer/app/img/rest.png
diff --git a/chapter2/app/img/sideplank.png b/trainer/app/img/sideplank.png
similarity index 100%
rename from chapter2/app/img/sideplank.png
rename to trainer/app/img/sideplank.png
diff --git a/chapter2/app/img/squat.png b/trainer/app/img/squat.png
similarity index 100%
rename from chapter2/app/img/squat.png
rename to trainer/app/img/squat.png
diff --git a/chapter2/app/img/stepUpOntoChair.jpeg b/trainer/app/img/stepUpOntoChair.jpeg
similarity index 100%
rename from chapter2/app/img/stepUpOntoChair.jpeg
rename to trainer/app/img/stepUpOntoChair.jpeg
diff --git a/chapter2/app/img/tricepdips.jpg b/trainer/app/img/tricepdips.jpg
similarity index 100%
rename from chapter2/app/img/tricepdips.jpg
rename to trainer/app/img/tricepdips.jpg
diff --git a/chapter2/app/img/wallsit.png b/trainer/app/img/wallsit.png
similarity index 100%
rename from chapter2/app/img/wallsit.png
rename to trainer/app/img/wallsit.png
diff --git a/chapter2/app/index.html b/trainer/app/index.html
similarity index 98%
rename from chapter2/app/index.html
rename to trainer/app/index.html
index 2f190d2..1baab6c 100644
--- a/chapter2/app/index.html
+++ b/trainer/app/index.html
@@ -6,7 +6,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>My AngularJS App</title>
+    <title>7 Minute Workout</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
diff --git a/chapter2/app/js/7MinWorkout/filters.js b/trainer/app/js/7MinWorkout/filters.js
similarity index 100%
rename from chapter2/app/js/7MinWorkout/filters.js
rename to trainer/app/js/7MinWorkout/filters.js
diff --git a/chapter2/app/js/7MinWorkout/services.js b/trainer/app/js/7MinWorkout/services.js
similarity index 100%
rename from chapter2/app/js/7MinWorkout/services.js
rename to trainer/app/js/7MinWorkout/services.js
diff --git a/chapter2/app/js/7MinWorkout/workout.js b/trainer/app/js/7MinWorkout/workout.js
similarity index 100%
rename from chapter2/app/js/7MinWorkout/workout.js
rename to trainer/app/js/7MinWorkout/workout.js
diff --git a/chapter2/app/js/app.js b/trainer/app/js/app.js
similarity index 100%
rename from chapter2/app/js/app.js
rename to trainer/app/js/app.js
diff --git a/chapter2/app/js/directives.js b/trainer/app/js/directives.js
similarity index 100%
rename from chapter2/app/js/directives.js
rename to trainer/app/js/directives.js
diff --git a/chapter2/app/partials/finish.html b/trainer/app/partials/finish.html
similarity index 100%
rename from chapter2/app/partials/finish.html
rename to trainer/app/partials/finish.html
diff --git a/chapter2/app/partials/start.html b/trainer/app/partials/start.html
similarity index 100%
rename from chapter2/app/partials/start.html
rename to trainer/app/partials/start.html
diff --git a/chapter2/app/partials/workout.html b/trainer/app/partials/workout.html
similarity index 74%
rename from chapter2/app/partials/workout.html
rename to trainer/app/partials/workout.html
index a5d75cf..e9f41ef 100644
--- a/chapter2/app/partials/workout.html
+++ b/trainer/app/partials/workout.html
@@ -5,10 +5,10 @@
                 <h1>{{currentExercise.exercise.title}}</h1>
                 <img class="img-responsive" ng-src="{{currentExercise.exercise.image}}"  />
                 <div class="progress time-progress">
-                    <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="{{currentExercise.duration}}" ng-style="{'width':(100 - (currentExerciseDuration/currentExercise.duration) * 100) + '%'}">
+                    <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="{{currentExercise.duration}}" ng-style="{'width':(currentExerciseDuration/currentExercise.duration) * 100 + '%'}">
                     </div>
                 </div>
-                <h1>{{currentExercise.duration-currentExerciseDuration}}</h1>
+                <h1>Time Remaining: {{currentExercise.duration-currentExerciseDuration}}</h1>
             </div>
         </div>
     </div>
