Cleanup (naming & structure).