fixed up package structure