Rename class and files. Some refact