Organizing settings, removed swap files