Refactored namespaces, Updated examples for STU branch demo-dsl