reorganize typing.rb in subdir