Bom refactoring

Initial proposal for the BOM refactoring