Change file layout from folder packages to file packages