Slight reorganisation to allow some simple components to be pre-packaged