Huge refactoring! Services, core, MVP, ...