Revert "Change in folder structure"

This reverts commit 149c24b3590a626e577c9450ba539f53096fbaae.