Moved services to /services folder
Updated services references