Moved two Setup templates to individual files #562