Separated dataset from dashboard module-wise, and moved services to terms module.