Import restructure