Re-organizing the data module; step 1.