Change solution folder structure and rename some projects appropriately