New scaffold with better organization.