Moving back to just two files.