Restructuring to get rid of SUPERCOP reference, it is incorrect