organized repo and cleaned up template code