Revert "Move files into folder"

This reverts commit 95d94658f5a16fd120ed2a26e2b85b326ac03ab1.