Split code into 1.5.x and 2.x
2.x version is not functional.