Re-structuring of import files