removing data router; integrating functionality directly into buildfile.