Reshuffle to make things easier
add branch to travis-ci for testing