temporary commit before moving stuff around
lots of refactoring
refactored ros-only tuff into separate directory