Header file moved from .cxx to .h