moved common data to DataAll and updated references
moved common data to DataAll and updated references