Clean up package structure