Resolved some dependency commits
Next step will be migration of the project to power-monitoring subproject module