(feat) clean up flux architecture