Reorganisation of generic components and adapters