move ir to packages, rebase make files to work with mokee builds