refactoring to make way for some tests - not sure why we had to move log4j.properties the way we did