Updated files and namespaces to be PSR compliant.