chore(cleanup): refactor to organization by module