Solving Circular Dependencies in Modules

Refactor module dependencies to allow clean separation of shared business concerns.