- folder structure updated
- getting around the code made clearer
Signed-off-by: Theodor Stana <t.stana@cern.ch>