Initial crack at cleaning up CRUD when migrating dojo structure