Added logger class, Main structure was changed