Restructure the drafts
Cleanup