Changed the package layout so that it can be installed from github.