some reorg; for travis-ci