Merging new structure
Merge conflicts resolved