Merged Data Layer into the Logic Layer

Data Layer has now been removed and we currently have a DataLogic layer
instead.