Refactor the structure
Refactor the structure
use w.js