More Refactor

making the code pretty, and inheriting from serviceModule for all routes