Everything in .h and no more refs to .cpp! (and there's a difference between utils.h and ../utils/utils.h)