[cleanup] Better organization for the log4j configuration