Clean up, split Xilinx into top-level