Fix layout so that the barclamp can be imported.