reorganize package hierarchy