Finish some stuff, and split classes into various packages