Merge "SF: Move frontend code to frontend namespace"