Rewrite tests to promises
Move files around so it fits with spec