Added packages to repo

Rearranged things to take into account packages.