GADMconverter huge refactor