VE-690 Decouple VE from VE Entry Points

https://wikia-inc.atlassian.net/browse/VE-690 @inez