Moving template utilities... help appreciated moving the other util files too