reorganized

Signed-off-by: James P. Gilchrist <james.p.gilchrist@gmail.com>