some re-organizing
...