modified folder names again, must be unique across all ROS stacks