Added refactured structure. WARNING! VariableSymbol has NOT been mapped yetgit status
Testing