Rename files, remove unused code