change to package structure