Reorganize package structure