Hadn't intended for this to be in the pull request, but I moved these files as the current structure doesn't build properly on Windows with Python 2.7.3. Moving the folder allows builds to work, though there are errors as the make script uses rm/cp commands which don't exist on Windows.