Revert "Modular and centered"

This reverts commit dc2083ffc1807660f07f2891f1936ad2c16bbd5c.
Revert "Revert "Modular and centered""

This reverts commit bc6e82547c0bda7b5b7adafd6d97ed1fec6ee5bd.