Fixing import directives