Rename files, fix some small bugs