Rearranging solution files

Rearranging solution files