Revert "Reorganise AGAIN (see desc)"

This reverts commit 34ed5aac47337f15b905464bb22f5414ddaf917f.