Removed .Data from directory

Fix up the solution and test directory