Moved templates external