Change module hierarchy again...

Now under Data/Text/Diagrams to silence hackage complaints.
This is all a mess.