fix package structure