restructure bench files