moved a few classes, code formatting