fix where files live, remove old toplevel callback
fix cloneWithProps tst