Revert "fix project structure"

This reverts commit 4640a31f69834acc4c5f26af9b2dbdae9e4a3328.