remove redundant files
change folder name via hasonuha convention
remove redundant files