restructured sources 1D and 2D