Removed Logger
Updated namespaces and using directives
some errors fixed