More reorg and changed logging to logback