Fix bug in popolo class instantiation
Add missing requirement
Add 'type' field to Organization