ES6: Migrate a few components over