Cleandir

Refactors base service directory structure.