Reorganized some classes, finally got inventory slots ordered correctly