A bit of restructuring