Fix organization template (remove double of contact-details-fields macro
Make OrganizationTypesOrLevels works if organizations are in a folder in the directory