Refactored Live source to WindowsLive source