More evil bindings, and reorg order of packages