Made change to RPC to allow easier rsync'ing. Also renamed some files