some cleanup
lots of moving files around, can get messy