Moved some classes around, making the system package less crowded.