Moves services into their own module directories