Lots of cleanup and folder organization