Folder structure updates
Fixed conflicts