Use proper angular modularization