Move more references to Front-matter

In Pursuit of #5.