Finished services refactoring. Continuing with controller refactoring...