Move files around so it fits with spec