Redoing the Xilinx files to make it import-friendly