AngularJS refactoring [WIP]
Semantic included [WIP]