Fixing imports in classes