fixup project strcture
fix travis