rework folder structure
all working
rework for windows builds