Fixed service management bugs.
Modified directories.
Merge pull request #2 from arktos65/arktos65_iteration_2

Arktos65 iteration 2