Tweak code organization
Tweak tests
Add Travis file