Move some classes around, and fix a few things in NBT