Folder Cleanup, added To Do list.