Rename addSetUp to before, put imports back