Structure and logging changes.

Structural changes cause of initialization changes and removal of static log4j dependency.