Started refactor of angular structure