moving non-generics to extensions

reverted IBus and RabbitBus to conform.