Refactor builders
WIP New doc structure migration