Moved DashboardStore to own package, and other things.