Structure changed

Singletons redesigned