bundled on Windows
refactored file layout