Refactor and renaming of a lot of classes and files.