Reorganized solution and projects