Revert "fix"

This reverts commit 9e8cc91cefe3b9845acf091968fc041d61085ac9.
Revert "fix"

This reverts commit 75a2db1ee628da877ddf29799ec98bc4777f7975.
Revert "fix"

This reverts commit 1d35417f17035d64cff392b224d6c39e1bfe7521.
Revert "fix"

This reverts commit e2f6193afff5edee22a67860a2359a24ed1a6d30.
Revert "Implementing p2p architecture"

This reverts commit 7f123b7e8156df0ba3ab7d7df377fd91a2fe57a0.
renaming for more clarity