Refactor services and repositories

• Prefer simple IDs over entity types for method parameters
• Avoid use of obsolete v2 classes in service and repository layers
• Optimize imports