Break out directory structure

Change-Id: I7d303c1b033d2a005031389144310191ec7679ba
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>