Moved some classes into the analysis project.