Also re-organized the directory structure.

Signed-off-by: Kevin Greenan <kmgreen2@gmail.com>