Moving and renaming files.  This build works, for the Pi, and I'm giong to create a branch to re-organize and a proper daemon hierarchy, then merge back when everything is stable again.