Re-adding files for templates and state machines