db path fixed; strcture improved