move everything around so test suite works

@paulca can you enable travis for this project?