Added 'category_manager' and 'category_model' structures. Few standards fixed.