Continue refactoring
Refactor and change some details to correspond current porject name