Moved types.go to the catalog/ package.
Major restructuring of package.