Did some cleanup and reorganization of stuff