Feature/53 country org structure