Added module loading and removed Singleton code.