Reorganized Data namespace into single class Data.cs