Moved database into db directory
Separate test and production data