moved more stuff around. starting to make this a "many language" project.