Refactorize the code

* Mostly renaming classes and files