Restructured Solution

Restructured solution to remove the dependency on Web for Data
components.