Refactor binaries folders. Fixes #48