Restructure import / export