Revert "Move files to subfolder"

This reverts commit 53184d424c6a3704fe548b5aaf3deb49b1298312.