reorganization and tweaking

the idea is economic factors are evaluated in taskqueuevehaviour, and
spatial factors are evaluated in taskqueues