Adjusted namespaces
Cleaned up public facing API
Resharper code cleanup