Rework file structure #TheAngularWay