Merge "Move ChronologyProtector up a directory instead of being by itself"