Fixed manual ordering of swapped items.
Split up reqs generation.
Merge branch 'master' into cache