Refactor soa-bom into mulitple files