(feat) clean up flux architecture
Merge pull request #46 from BaBuDe/master

(feat) clean up flux architecture