chore(cleanup): Restructure the module to make more sense