Revert "Removed all subfolders"

This reverts commit 46cd0fceec73254efdb69897ca8f0c6d61c80523.