wrap models in a proper namespace
fix the messages command - broke after wrapping all classes in a namespace