Trying Mocha & moved a bunch of files to misc