Split a few files into .h and .cpp