Clean up package structure, add broken memset