Shader factory added, namespace fixed