Back to Suppliers & Countries as Content types, updated migration accordingly