Move BwlMetrics class into Bwl