Merge "Dao object moved from dao packege to package by component in service folder"