enhance: lower coupling

Is your feature related to a problem? Please describe.

As a future developer I want modularity.

Describe the solution you'd like.

Refactor the code so it has looser coupling.