Migrating elements to their own class