[WIP] Complete restructure.