Hotfix: keeping folder structure (^Jw)