more refactoring to separate to angular modules