Get rid of C++ reference

Reference are difficult to use for beginners in C++, let's use wrapper classes instead.