moved sampattavanich stuff into appropriate places in source tree