further adjustments on architecture
Merge pull request #9 from peedeeX21/master

update