Merge "Split classes in Import.php into separate files"