Restructure. Cleanup.