reorganized package structure