Made lots of changes. All unit tests work except one in serialData

Signed-off-by: Joseph A. Lutz <CipherWizard@cipherwizard.net>
Move files around to get unittest autodiscover to work easily.

Signed-off-by: Joseph A. Lutz <CipherWizard@cipherwizard.net>