[refac] changed file names to integrate files over libxively and make it safe to use against different libraries and environments