Update to package structure