readme tweaks, code reorganization