Merging basicStructure into master with stable version

Merging the basicStructure into the master branch with a stable version.