Updated angular structure using John Papa AngularJs style guide