Throw away old code, use GeneralMatrix for larger n and k

Also separate algorithms from Matrix code