reorganized stuff in case I want to add more schemes, and so regular kind and CL shared include dir searches don't overlap.