adjusted namespaces and type names
updated for tutorial step 2. constructors and non-static properties
continuing tutorial, untested at this point