Foldered, deleted, separated. Cleaned up the mess.