Added OrganizationId to Category. Refactoring in Product/Categories administration