Revert "Fix the Travis"

This reverts commit 02b0d3ede71c5957653f6864b87c3d14e7a3bd17.
Revert "Fix strucutre"

This reverts commit 7142bc3f83acd1a1d7aecda20a120614732f8214.