Cleaned Folder; Updated todo;