Moved service code into its own package
Sorted all members in source