update

restructure some files