Merging from my restructure of the Angular JS folder
Restructuring the AngularJS side of things. 

Conflicts:
	AWS/app/index.html
Restructuring the AngularJS side of things. 

Conflicts:
	AWS/app/index.html