Clean up cmake
Switch to rectangular footprint.