Code reorganized
Markup parser started