Reorganized some files and added unit testing base classes.