Moved the prod edits into better structure.