Changes to package structure