Rearranged project, preparing for AngularJS-oriented pages