reorganize project with package