simplied dir organisation

Signed-off-by: Gaetan Semet <gaetan.semet@intel.com>