Added files that were list, updates to classes

When I did the reorg I didn't add most of the files back into git.