Modularizing Angular
Merge conflict fix
Merge fix