Fix demo-catalog-data script
Review modules structure