Merge pull request #259 from Alexpux/mingw-w64-builds

Cleanup build script
Files reorganization