Refactored a lot of services into sub packages