Folder changes and 2 more tasks added