moved templated to their own folder, added utils