Moved helper unit into primary folder