Restructure + Cleanup.