logging cleanup and renaming of structure