Prepare for SIMPLEROUTE merge (more files)