Move stuff to omen packages