Merging basicStructure into master with stable version

Merging basicStructure into master with stable version.