Move service classes into app/services