[TASK] Namespacify services Pt. 1