lots of cleaning up moving classes around