Expand skeleton

Adopt C++, deprecate C