fixup ciodetree.cc to old state
add new instantiate file
add instantiation file to Makefiles
rebuild fpoptimizer