Unified binary directories as suggested by @cartman300
Moved Data directory as suggested by @cartman300