reoganized database code
reorganized config files