Moved stuff around.
Refactored catalogs, moved implementations into separate folders.
Removed IContainer interface.