refactoring js structure + change of vendor set