Revert "Changed folder structure"

This reverts commit 49104339b2cbe2cdec52e1de7dca452202289cf7.