Enable drag&drop

Change data structure.