reorganize file in lib