Shifted around some code.  There are less files and everything is in one place.