Refactor and clean

- move kvoutsa name to kvoutsa app
- remove redundant and unused includes
- recomment