Added some additional ng modules
Evolution of the app came to some sharp point. Need new architecture