Updated requirements.  Restructured settings files