Various changes and bug fixes
Full reformat
Move some classes around, and fix a few things in NBT