cleaning up and reorganizing lots of things