Revert "Reorganise part 2 (deletion)"

This reverts commit 0351993a05f58c6463a2a6f297946d2a22ccc0da.