shuffling around solution and proj folder structure