Setup structure
Merging upstream and master