Move back to the standard naming for the C++ bits.
Moving back to regular directories.
Move back to regular directory naming and start deleting code!