Project structure refactored, processes moved one level up
merge