Begin init system refactoring