Move structures and classes into header files, providing two new headers and