Got rid of a few useless classes
Update structure is now somewhat done, though completely untested