Changed some things for new working structure
Revert "Changed some things for new working structure"

This reverts commit 26d1f6bb20e61c7e580f6b032018a7dbd251f40a.