Revert "Project structure improved"

This reverts commit 7d072ee2520f1154878efb3f56fc0f619cadb6eb.