refactoring services to include parts, organizations, navigator and cottage