Merged services, filters and outputs into a single thing
Fixed AdminSite