moved code around to be cleaner
Configuring the repo to support travis-ci