Move structures to their world type packages

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>