Refactored service interfaces into seperate modules