formatted code, organized imports, move some new classes to their correct packages, renamed a few things
misc cleanup