- Separated more things out into components.