Module folder refactor

Moves angular files into modules folder