Merge pull request #106 from russel/russel

Refactor header files to remove the hxx files.