Move some classes around.