Lots of reorganizing and cleaning up from last semester