Removed unused extra layer of folders in solution