Some refactoring, path for database file changed.