More sandbox modularization and classical structuring.