progress
code refactoring of catalog
code refactoring of other modules