Fixed layout of Logger
Removed class from Logger
Implemented Logger from TV branch