Add use of namespaces and a service layer