* Try to break up the C++ interface into smaller chunks In order to make compilation less RAM intensive * Inline the makers, also add the other sources * Tidying up the splitting