- adding correct imports
- refactoring repository structure