A bit of restructering