Fixing bugs.

Modified the namespace structure to avoid conflicts in client code due to ambiguities between objects defined in the structure, layout and common namespaces