some structural work (renaming, ...)