refactor to strict element__block naming scheme
add server