Renamed folder and helper interface.  Changed style to match rest of the code base.