Cleanup & renaming
Move import, tweak Travis