Refactoring Service classes into partial classes and splitting each property into its own header