Reorgnize as suggsted by @dsufft