yet more reorganizing of files