Initial restructure.