Revert "change package structure to make installable from github"

This reverts commit b12ce5f8ba40f7e22987a92c9908d3b98639c2ae.