Moving database module and database into separate database directory...