Reorganized directory structure
Merge branch 'master' into feature-time-estimate

Conflicts:
	server/spot/zoom/core/cache/time_estimate_cache.py
MOved post merge
done merging