Re-organizing the data module; step 2.