Restructured settings folder