[jdf-dev] BOMs reorganization