updated schema and fixed some namespace issues
Merge pull request #2 from pigeonflight/lab-schema

updated schema and fixed some namespace issues