Restructured solution folder structure