moved files around, added a bunch to melinda.js