work in progress -- rename some files and functions