Rename template classes to draft, e.g. NewCategory to CategoryDraft. Close #143