Restructure document, add generic BOM version