Reorganized tree in preparation for rpm packaging.

Change-Id: I1e8ed2878d9dc048744251ba3f68be0e6de58124
Signed-off-by: rexwhite <rexwhite@redhat.com>