Minor refactoring, relocating non-service classes outside of service folder