Move specs from type to type/base
Fix iptables
Fix kernel_module