updated setup to be able to be installed and fixes version2 codebase