Add new folder structures and @todo blocks