Started changing structure to comply with AngularJS Best Practices.