Changed naming convention to use "switch" rather than "router".  Added a couple typedefs to common.h.  These typedefs are not currently being used as I'm breaking up my local changes into chunks.