Moving DB out of main source