neater hpp/cpp split for data types