Separated packaging and catalog
Fixed installing