Refactor catalogue package to dev-master.