Finally, everything compiles. Now, to clean up some structures... and
bring the contents of the directory in line with the distribution.