Changed folder names

Neccesary to avoid "path too long" windows errors