package structure changes