Refactored code to follow karma package naming conventions