Fixes after the work package reorganization
Added macros for tasks and deliverables
Reorganized H2020/WorkPackages/UserInterfaces using those macros. Please use as template.