organize to mirror python version; comments