A bit of re-organizing