Move org keys to the Org section