Structural updates to separate live and dev code.