Merge changes of structure and documentation