Revert "some fixes"

This reverts commit 232b1ef9136c9d0c4adb7a8c39d0b084140743e3.
Revert "new architecture in project"

This reverts commit 640dad1dc9b10c6668ddd45c34dddf2159ff0338.