Complete Singleton example into test App
Move files around