Fix the directory structure

Change-Id: Ie94ee404e3c6c9e0d16d64655b58c7ccbfbcd2c9
Signed-off-by: Brian McGillion <brian.mcgillion@intel.com>