nit: copyright statements on all of these files?