re-organize package