update to current package structure