[DEV] Refactoring to support x64 build on Windows