Switched plugin structure to use namespace