Namespacing and project structure
Clean up ReSharper rash