[Architecture] Change directory structure to enable a master build

Signed-off-by: Regis Merlino <regis.merlino@intel.com>