Minor refactor

Moved all log4j code into a package to allow logback additions later
Other minor changes