Extracted services. All controllers now use only services