Tidying up drafts folder and (finally) completing the separation of drafts from page-ier stuff