Data Table: imporove diagram, reorganize shared modules