Clean up and reorgenize
Moving things around to rearrange structure