Add Vsix, refactor