Definitions in wrong file

Template definitions need to be defined in the header