Refactore code + use composer + upgrade to Guzzle 4