Re-organized solution, renamed projects to better reflect intent