Applied fix for directory import order