Refactor bridge to match ruby.
readd moved file