Renaming services and daos to usercase and contract