Fixing new line annoyance
Removing paths in services, passing them in using constants