Moving files around a bit.  Got rid of io dir/module because it
was being confused for the system io module.