Aligned namespaces with Assembly names
Minor reformatting