Reformatting code and optimizing imports.
Added Main-Class to jar.
Created adapter in preparing for removal of log4j.