Further refactoring in mrpt-base