Restructured package: deleted existing C code, new tests