Removed NewSingleton.java and added safe.java