cleaning up clutter/disorganization in folder structure