made data import process more object oriented, and fixed duplicate file listing issue