Added support for windows folder structures