Rename logger to Logger
Rename when changed location
Fix logger messages