#4137 Move top level component interfaces up

Note - still to  change namespaces