Revert to 29 and split HTMLElementBuilder in more class