Refactored repo structure to include both C and Py versions in subdirs. Should make it eaiser to merge fork back into orig (the goal).