Refactoring several classes (move and rename).
Changes at UI