Reorganize, added testing tcheck