move to correct packages, add licensing, fix api a bit