Moved settings under one structure.