Fix more imports from the move. Rename files to not conflict with pre-existing package names.
Fix broken log reporting by adding proper share information.