Rename class names
update git ignore