re-structuring due to virtualenv bug