fixup some errors from moving files; clock builds and runs now