Rename some system files and remove the old test files