Restructure: Kludge redirect.

* Must fix later!