Removed concept of SingletonComponent and ComponentGroup. Instead, introduced ComponentUtils to fill the gap.