Carcassonne modal inserts base + extensions

I wanted to make a nice Carcassonne inserts for myself which would fit my 4 expansions in the original box but it would also be modal so I can add more stuff if I buy yet another expansion. The layout is simple:

2x meeple tray
4x Tile tray vertical one of witch have dividers for River and 50/100 tiles
1x Accessories Tray horizontal
1x Tile tray modal or yet another accessories tray if needed
2x holder (normal + modal) for the bags

You can exchange
1) **tile tray** for **accessories tray modal**
2) **holder modal** for **accessories tray** or **tile tray modal**
3) **tile tray modal** for **accessories tray**

Note:
Box can fit up to 3 horizontal trays with 1 modal holder