minor optimization in StormImport
moved some directory