rename toggle switches to binary switches
rename files to match types
adjust namespaces