There is no reason for the extra directory level. Also fixup some go lint issues Signed-off-by: Dan Walsh <dwalsh@redhat.com>