update keys and dir structure
add tvheadend