Project to Solution Restructure