Add remaining C++ classes into main module