Pacackage restructure