[WIP] Removed ect template module. Refactored Angular code