Revert "Change in folder structure"

This reverts commit 57fd96994b1c8168c85a99e88ac282d71fc6cf18.