more restructuring

still far from first usable software…