Make Singleton separate file