reorganize the packages and files