More restructure

And there goes our commit flow, Nayt. Next time, move the CONTENTS to
the directory.