Adjusted namespaces
Added events
Added Logger