Changed the import mechanism to mimic 'from x import y'