Update Identifier and apply for classification of goods.

Fixes #119 and #99

This identifier will also be used for organizations
Re-organize organizational identifiers

Use new identifier, allow for secondary IDs and put name on main block

Fixes #46
Fixes #62