reorganizations + comptests
do not load ROS until necessary