rearrangements and naming correction
rearrangements and naming correction

ismaelgaudioso/Coherence,sreichholf/python-coherence,unintended/Cohen,furbrain/Coherence,coherence-project/Coherence,coherence-project/Coherence,furbrain/Coherence,sreichholf/python-coherence,unintended/Cohen,opendreambox/python-coherence,ismaelgaudioso/Coherence,opendreambox/python-coherence