renamings, relocatings, more comments