Moved a few classes to Console