Revert Unicode/UTF8 change for Windows Phone #114
Initial refactoring work