Project divided on two parts
Revert "Project divided on two parts"

This reverts commit cfac3b295f3fbb825502d7279a569f0d22c45bcc.
Merge remote-tracking branch 'origin/master'