moved to a completely AngularJS modular structure