defconfig: Remove duplicates
Fix compile errors
Add zip layout