restructure and clump.js started