Fixing imports from other dirs