moved around some files; adapt to upstream