Added logger, project simplified