new structure, touch after the final, bugfixing

Signed-off-by: Fotis Georgatos <fotis@cern.ch>