Big re-org and addition of all expected angular modules