refactor helpers and move ipc to modules
Merge branch 'develop'

* develop:
  refactor helpers and move ipc to modules