More separation of local files.