refactor query
add translation
update locations of libs
update todo