Commenting and directory renaming