Merge "Move Browser-only files to Browser package"