moved constraint c files to top level
got rid of compiler warnings; updated body and spec