Refactor binaries folders