clean up package structure