Fixing import paths