reorganize packages structure + dao