Unified binary directories as suggested by @cartman300