Added more logging.
Added more logging.
Finally started moving some modules around and added relative imports.