reorganize + main.js