Reorganized package structure a little more