Dino catalog/mohammad

Use CamelCase for classes and modules.