Added DashboardBundle
Major refactoring