Added Undecorate. Reorginized C++ files