Merge pull request #801 from CEED/jeremy/no-switchesRefactoring Solids to Remove Switches
minor - folder name consistency