Revert "Project architecture"

This reverts commit 23152528b644d2401a30f0b5bb639273a20ae7f1.