Reorganizing javascript files, too messy