AssemblyInfo and Namespace cleanup for PR
Moved file to correct location