refactoring, redefined imports for the library, changed and fixed database path