restructuring, alongside heddle
updated shuttle.rb