Solution and projects reorganized