soft refactoring + added getting absolutePath in DAO, all tests passed