Code consistency and cleanup of Binaries folder.