Bring template in, remove submodule

Fix #94