some reorganization and updating

Signed-off-by: Yannick Wurm <y.wurm@qmul.ac.uk>