Spring cleaning and organization

Spring cleaning and organization