Moved classes into packages by category.