adds org name and fixes import problem