Scribite 5 refactor

@espaan - would like to merge this. ok?