Started clean up of config

Attempting to make it easier to create more complicated signal types