Moved services back into app
Moved services back into app