Moved files from simplified_rpc and updated Makefile