swift_new: reorganize hieradata

Change-Id: Ibddd82db898c16666feb2c58fb4c25daa32c38a1
Signed-off-by: Giuseppe Lavagetto <glavagetto@wikimedia.org>