updated database directory structure and replaced database decorators with database initializers