[ros-diffs] [janderwald] 24944: - shuffle resource files a bit