Made some order among the built-in classes. Mostly just moving them around, very little refactoring.