[ecesena]

It's still separated, but they are near each other.

I personally like this way better, easier to find when need to fix something.