Moved some classes about.
Modded some docblocks and formatting.
Various logging improvements.