Refactoring. Added Client & Catalog controllers