Start rework of class resolution into a series of class repositories.