Moving settings to appropriate files and documenting them