re-arrange into packages
readme fixes
re-arrange into packages