Refactor CoreService to Module