Further folder/file changes