Fixed namespace issues - remove AmplaData.Security

Moved the classes into the correct namespace and other Resharper issues.