Renamed directories (dropped "_pubsub")