mov: Restructured the packages