switched to more angular-like module naming convention