refactor the dir, move the packages to the root