Modify package structure