Re-factored data file structure