fix namespace collision with dirs.[ch] and bug fix in pe_monitor
fix Makefile.am to match

Change-Id: I5239a6c97500ac6a3d34bff4e63a2f85596cae81
Signed-off-by: Scott Mann <smann@noironetworks.com>