New directory structure and more secure virtualenv checking