Added loggers and changed structure a bit