Moved files to one directory
Duplicate variable
Modification to adjust for directory changes
WSGI updates
Nit