Fixing module imports