use angular. refactored modules