Fix old import structure