Cleaned up the solution structure and project naming.