Folder and include changes