Adding "Service" namespace under psm and moving database + template handlers