FIx import structure