some package restructuring