Fixes routing
Adds new services files for entourage and general
Rearranged files and routing