rearranging package structure