Move services to subfolders
Move content requests to factory