Move catalog logic into System so that all may use it
Remove dumping
Remove category dumping command