Changed files layout to ease debugging on Windows