Some quick reorganization.