various
moved code to src, a bit of cleanup
lots of fixes, taking form
almost ready