Fix compilation errors
Complete package renaming
Change package name to keep internal coherence (always using 'catalog')
Simplify catalog API