added gitmerge files to new folder
Merge branch 'restructure'