Sync master branch

Preparing to reorganize the structure of our repository