rearranging - database into separate project continued