Refcator header file out into separate files.