Move Singleton to util/.
Fix ambiguity.