Forgot a template file and some files after refactoring