Changed File Structure, updated demand_analysis.py
Fixed demand analysis script...