A bit of restructuring ...