#28 Renamed and made a few updates to BOM