refactor split lib
rename some files