Further updates

Removal of TagGenerator.cs - functions now in ConfigurationSingleton.