Restructuring import scheme