New structure

Signed-off-by: emanuele <emanuele45@gmail.com>
Updated to elk commit 2ce1bfcabd5aac82f7fee8ef385799fb26d07aa6

Signed-off-by: emanuele <emanuele45@gmail.com>
Merge pull request #9 from emanuele45/upgrading

Upgrading