more reorganizing. SPRING CLEANING