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