Moving files around to simplify operations