Renaming, moving, more logging, fixing unit tests.