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

Files reorganization