Rearranged solution file for jenkins build.