Another reorganisation.

Having a common folder made it messy to link between different versions
of record types.