File structure changed to more closely follow AngularJS style guide