Changed directory structure to enable adding more services