changed logic for files and templates, data is now passes as evmessage file not keyvalue
fixed merge conflicts
fixed tests for rpc-files and rpc-templates