fix isses #1 and remove some duplicate files;