Simplify C++ library, put everything in the headers