Fixed some path errors
Renamed binary
Some merges