Moved Reachability to the correct class