Refactor: rename components
Reactor: reorganize services
Refactor: rename services