Added database model and reordered files/directories