Updated file structure for virtualenv