organizing and removed log4j issue #50