folders1

settings and 960gs
Revert "folders1"

This reverts commit 9133b84b77a339aab30260258203a3cb0382426c.