A Thought On Federal Security

With a brouhaha building over whether federal buildings should be protected by federal security officers, I had a thought. Should there be a single agency that oversees all federal security officers, like the Transportation Security Administration and the Federal Protective Service? If folks are performing similar functions, even if different situations cause them to exercise different standards of security, does it make sense for training and efficiency purposes to have them in different agencies?