Moved namespace URIs into respectively classes