reorganize for travis + testing + bundler