Changed database organization

messed up namespace