refactored position of angular includes