change package structure to make installable from github