Refined structure

The previous commit was not a unified list, it was a collection of
lists. This was not as intended.