Restructured settings directories and removed unused files