Clean windows part
Refactor
Add missing files