Does a large scale refactor to move all classes into packages that make more sense