Folder cleanup.  Long over due.