Moved texture loading to singleton
fixed conflicts