Move core-env to common
Reorder emission content